bitkeeper revision 1.1608 (429c646erSBefwnCqVeHKzsRTMIwjA)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 31 May 2005 13:19:42 +0000 (13:19 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 31 May 2005 13:19:42 +0000 (13:19 +0000)
Merge.

1  2 
docs/src/user.tex
xen/Makefile

Simple merge
diff --cc xen/Makefile
Simple merge